Differences between two file versions

In the above illustration, you can see the differences between the WORK and the HEAD version (the latest version of the file in the Repository) of

BackOffice.java . The difference in the comment in the two file versions is shown to the left and the right of the Merge button.

Press the Merge button (<) to merge the differences between the two file versions.
Choose File > Save to save the changes.
The Differences List is now empty.
Drag the layout handle to the left to increase the width of the File List.
Highlight

BODeal.java in the File List.
You can see the difference between the two file versions.
Follow steps 1 and 2 above to merge the differences and now do the same for BrowserNode.java.
Review
This was the last of the SNiFF+ browsing tools to be introduced in this tutorial.
In this part of the SNiFF+J Java Tutorial you were introduced to the following browsing tools:

- The Symbol Browser
- The Hierarchy Browser
- The Class Browser
- The Cross Referencer
- The Retriever
- The Diff/Merge tool

What's next

- Close all tools except for the Launch Pad and the Project Editor.
- From the Visibility drop-down in the Project Editor, select Writable + Read Only.

The next part introduces you to:

- Setting up the SNiFF+ build system
- Tools used for editing, compiling and debugging Java code with SNiFF+.